Merge branch 'stdout' (#6)

knewjade · Mar 27, 2022 · bb500a8 · bb500a8
2 parents 1cde8db + 90094b1
commit bb500a8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/main/java/entry/path/output/MyFile.java b/src/main/java/entry/path/output/MyFile.java
@@ -27,9 +27,15 @@ public MyFile(String path, boolean outputToConsole) {
     }
 
     public void mkdirs() throws FinderInitializeException {
-        // 親ディレクトリがない場合は作成
-        if (!file.getParentFile().exists()) {
-            boolean mkdirsSuccess = file.getParentFile().mkdirs();
+        // 親ディレクトリが有効でない場合はエラー
+        File parentFile = file.getParentFile();
+        if (parentFile == null) {
+            throw new FinderInitializeException("Parent directory is not invalid: OutputBase=" + path);
+        }
+
+        // ベースディレクトリがない場合は作成
+        if (!parentFile.exists()) {
+            boolean mkdirsSuccess = parentFile.mkdirs();
             if (!mkdirsSuccess) {
                 throw new FinderInitializeException("Failed to make output directory: OutputBase=" + path);
             }

diff --git a/src/test/java/_usecase/path/PathIrregularCaseTest.java b/src/test/java/_usecase/path/PathIrregularCaseTest.java
@@ -2,8 +2,8 @@
 
 import _usecase.ConfigFileHelper;
 import _usecase.Log;
-import _usecase.path.files.OutputFileHelper;
 import _usecase.RunnerHelper;
+import _usecase.path.files.OutputFileHelper;
 import core.field.Field;
 import core.field.FieldFactory;
 import core.field.FieldView;
@@ -657,4 +657,13 @@ void invalidHold() throws Exception {
                 .contains(command)
                 .contains("Cannot parse hold option: value=INVALID [FinderParseException]");
     }
+
+    @Test
+    void unsupportedConsoleOutput() throws Exception {
+        String command = "path -t v115@9gB8HeC8GeD8FeC8QeAgH -p *! -o -";
+        Log log = RunnerHelper.runnerCatchingLog(() -> EntryPointMain.main(command.split(" ")));
+
+        assertThat(log.getReturnCode()).isNotEqualTo(0);
+        assertThat(log.getError()).contains("Parent directory is not invalid");
+    }
 }