File tree Expand file tree Collapse file tree 2 files changed +34
-5
lines changed
main/java/de/nihas101/imageToPdfConverter/gui/controller
test/java/de/nihas101/imageToPdfConverter/gui/controller Expand file tree Collapse file tree 2 files changed +34
-5
lines changed Original file line number Diff line number Diff line change @@ -165,13 +165,17 @@ public void chooseDirectory(ActionEvent actionEvent) {
165165 givenDirectory = createDirectoryChooser (mainWindow .imageToPdfOptions .getIteratorOptions ())
166166 .showDialog (directoryButton .getScene ().getWindow ());
167167
168- if (givenDirectory != null ) {
168+ setupChosenDirectory (givenDirectory );
169+
170+ actionEvent .consume ();
171+ }
172+
173+ public void setupChosenDirectory (File directory ) {
174+ if (directory != null ) {
169175 buildProgressBar .setProgress (0 );
170- mainWindow .chosenDirectory = givenDirectory ;
176+ mainWindow .chosenDirectory = directory ;
171177 startSetupIteratorThread ();
172178 }
173-
174- actionEvent .consume ();
175179 }
176180
177181 private boolean userWantsAZipFile () {
@@ -350,7 +354,7 @@ private void startPdfBuilderThread(PdfBuilder pdfBuilder) {
350354 /**
351355 * @return True if a all necessary values for building the PDF are set, false otherwise
352356 */
353- private boolean valuesSetForBuilding () {
357+ public boolean valuesSetForBuilding () {
354358 if (mainWindow .getDirectoryIterator () == null ) {
355359 notifyUser ("Please choose a directory" , RED );
356360 return false ;
Original file line number Diff line number Diff line change @@ -110,4 +110,29 @@ class MainWindowTest : ApplicationTest() {
110110 fun clearAllNoSetup () {
111111 clickOn(" #clearAllButton" )
112112 }
113+
114+ @Test
115+ fun setupDirectory () {
116+ mainWindowController!! .setupChosenDirectory(File (" src/test/resources/images" ))
117+
118+ assertEquals(true , mainWindow!! .chosenDirectory.exists())
119+ assertEquals(true , mainWindow!! .chosenDirectory.isDirectory)
120+ }
121+
122+ @Test
123+ fun valuesSetFalse () {
124+ assertEquals(false , mainWindowController!! .valuesSetForBuilding())
125+ }
126+
127+ @Test
128+ fun valuesSetTrue () {
129+ setupDirectoryIterator(" src/test/resources/images" )
130+ assertEquals(true , mainWindowController!! .valuesSetForBuilding())
131+ }
132+
133+ @Test
134+ fun valuesSetNoFiles () {
135+ setupDirectoryIterator(" src/test/resources/images/doesntExist" )
136+ assertEquals(false , mainWindowController!! .valuesSetForBuilding())
137+ }
113138}
You can’t perform that action at this time.
0 commit comments