Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This fixes an issue where the "are all files filtered" check was being carried out in the OK button method. This caused the button to silently fail in CREATE mode when the name of a nonexistent file was typed in and an "is regular file" check was provided for the file selection mode. Fix: #34
- Loading branch information
Showing
4 changed files
with
164 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
132 changes: 132 additions & 0 deletions
132
com.io7m.jwheatsheaf.tests/src/test/java/com/io7m/jwheatsheaf/tests/JWFileChooserBug34.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| /* | ||
| * Copyright © 2020 Mark Raynsford <code@io7m.com> http://io7m.com | ||
| * | ||
| * Permission to use, copy, modify, and/or distribute this software for any | ||
| * purpose with or without fee is hereby granted, provided that the above | ||
| * copyright notice and this permission notice appear in all copies. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
| * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
| * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY | ||
| * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
| * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
| * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR | ||
| * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
| */ | ||
|
|
||
| package com.io7m.jwheatsheaf.tests; | ||
|
|
||
| import com.io7m.jwheatsheaf.api.JWFileChooserAction; | ||
| import com.io7m.jwheatsheaf.api.JWFileChooserConfiguration; | ||
| import com.io7m.jwheatsheaf.api.JWFileChooserEventType; | ||
| import com.io7m.jwheatsheaf.api.JWFileChooserType; | ||
| import com.io7m.jwheatsheaf.api.JWFileChoosersType; | ||
| import com.io7m.jwheatsheaf.ui.JWFileChoosers; | ||
| import javafx.scene.input.KeyCode; | ||
| import javafx.stage.Stage; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.TestInfo; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
| import org.testfx.api.FxAssert; | ||
| import org.testfx.api.FxRobot; | ||
| import org.testfx.framework.junit5.ApplicationExtension; | ||
| import org.testfx.framework.junit5.Start; | ||
| import org.testfx.framework.junit5.Stop; | ||
| import org.testfx.matcher.base.NodeMatchers; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.file.FileSystem; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| @ExtendWith(ApplicationExtension.class) | ||
| public final class JWFileChooserBug34 | ||
| { | ||
| private JWTestFilesystems filesystems; | ||
| private FileSystem dosFilesystem; | ||
| private JWFileChooserType chooser; | ||
| private List<JWFileChooserEventType> events; | ||
| private JWFileChoosersType choosers; | ||
|
|
||
| @Start | ||
| public void start(final Stage stage) | ||
| throws Exception | ||
| { | ||
| this.events = Collections.synchronizedList(new ArrayList<>()); | ||
|
|
||
| this.filesystems = JWTestFilesystems.create(); | ||
| final var systems = this.filesystems.filesystems(); | ||
| this.dosFilesystem = systems.get("ExampleDOS"); | ||
|
|
||
| final var configuration = | ||
| JWFileChooserConfiguration.builder() | ||
| .setAction(JWFileChooserAction.CREATE) | ||
| .setFileSystem(this.dosFilesystem) | ||
| .setFileSelectionMode(path -> { | ||
| return Boolean.valueOf(Files.isRegularFile(path)); | ||
| }) | ||
| .build(); | ||
|
|
||
| this.choosers = JWFileChoosers.create(); | ||
| this.chooser = this.choosers.create(stage, configuration); | ||
| this.chooser.setEventListener(event -> this.events.add(event)); | ||
| this.chooser.show(); | ||
| } | ||
|
|
||
| @Stop | ||
| public void stop() | ||
| throws IOException | ||
| { | ||
| this.choosers.close(); | ||
| this.chooser.cancel(); | ||
| } | ||
|
|
||
| /** | ||
| * In CREATE mode, specifying a nonexistent file if using a filter that | ||
| * checks if files are regular files, does not silently fail when the user | ||
| * clicks OK. | ||
| * | ||
| * @param robot The FX test robot | ||
| */ | ||
|
|
||
| @Test | ||
| public void test_NameField_NonexistentFileDoesNotSilentlyFail( | ||
| final FxRobot robot, | ||
| final TestInfo info) | ||
| { | ||
| JWFileWindowTitles.setTitle(this.chooser, info); | ||
|
|
||
| final var delegate = new JWRobotDelegate(robot); | ||
|
|
||
| final var okButton = | ||
| robot.lookup("#fileChooserOKButton") | ||
| .queryButton(); | ||
|
|
||
| robot.clickOn("#fileChooserNameField"); | ||
|
|
||
| FxAssert.verifyThat(okButton, NodeMatchers.isDisabled()); | ||
| robot.write("THIS_DOES_NOT_EXIST.TXT"); | ||
| delegate.pauseBriefly(); | ||
| FxAssert.verifyThat(okButton, NodeMatchers.isEnabled()); | ||
|
|
||
| robot.type(KeyCode.ENTER); | ||
| FxAssert.verifyThat(okButton, NodeMatchers.isEnabled()); | ||
|
|
||
| FxAssert.verifyThat(okButton, NodeMatchers.isEnabled()); | ||
| robot.clickOn(okButton); | ||
|
|
||
| Assertions.assertEquals( | ||
| List.of("Z:\\USERS\\GROUCH\\THIS_DOES_NOT_EXIST.TXT"), | ||
| this.chooser.result() | ||
| .stream() | ||
| .map(Path::toString) | ||
| .collect(Collectors.toList()) | ||
| ); | ||
| Assertions.assertEquals(0, this.events.size()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters