1 files changed, 44 insertions, 8 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java b/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java
index deea1a820d9..3dd845ec56f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/filedistribution/UserConfiguredFilesTest.java
@@ -1,14 +1,17 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.filedistribution;
 
 import com.yahoo.config.FileNode;
 import com.yahoo.config.FileReference;
 import com.yahoo.config.ModelReference;
 import com.yahoo.config.UrlReference;
+import com.yahoo.config.application.api.ApplicationPackage;
+import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.application.api.FileRegistry;
 import com.yahoo.config.model.application.provider.BaseDeployLogger;
 import com.yahoo.config.model.deploy.TestProperties;
 import com.yahoo.config.model.producer.UserConfigRepo;
+import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.config.model.test.MockRoot;
 import com.yahoo.vespa.config.ConfigDefinition;
 import com.yahoo.vespa.config.ConfigDefinitionKey;
@@ -25,6 +28,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.logging.Level;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -69,12 +73,20 @@ public class UserConfiguredFilesTest {
         public String toString() { return export().toString(); }
 
     }
-
     private UserConfiguredFiles userConfiguredFiles() {
+        return userConfiguredFiles(new MockApplicationPackage.Builder().build());
+    }
+
+    private UserConfiguredFiles userConfiguredFiles(ApplicationPackage applicationPackage) {
+        return userConfiguredFiles(applicationPackage, new BaseDeployLogger());
+    }
+
+    private UserConfiguredFiles userConfiguredFiles(ApplicationPackage applicationPackage, DeployLogger deployLogger) {
         return new UserConfiguredFiles(fileRegistry,
-                                       new BaseDeployLogger(),
+                                       deployLogger,
                                        new TestProperties(),
-                                       new ApplicationContainerCluster.UserConfiguredUrls());
+                                       new ApplicationContainerCluster.UserConfiguredUrls(),
+                                       applicationPackage);
     }
 
     @BeforeEach
@@ -289,18 +301,42 @@ public class UserConfiguredFilesTest {
     }
 
     @Test
-    void require_that_using_empty_dir_gives_sane_error_message(@TempDir Path tempDir) {
-        String relativeTempDir = tempDir.toString().substring(tempDir.toString().lastIndexOf("target"));
+    void require_that_using_empty_dir_fails(@TempDir Path tempDir) {
+        String relativeTempDir = tempDir.toString().substring(tempDir.toString().lastIndexOf("target") + 7);
+        ApplicationPackage applicationPackage =
+                new MockApplicationPackage.Builder()
+                        .withRoot(tempDir.toFile().getParentFile())
+                        .withFiles(Map.of(com.yahoo.path.Path.fromString(tempDir.toFile().getAbsolutePath()), ""))
+                        .build();
+
+        var logger = new TestDeployLogger();
+        def.addPathDef("pathVal");
+        builder.setField("pathVal", relativeTempDir);
+        fileRegistry.pathToRef.put(relativeTempDir, new FileReference("bazshash"));
+        userConfiguredFiles(applicationPackage, logger).register(producer);
+        assertEquals("Directory '" + relativeTempDir + "' is empty", logger.log);
+    }
+
+    @Test
+    void require_that_using_non_existing_dir_fails() {
+        String relativeTempDir = "non-existing";
         try {
             def.addPathDef("pathVal");
             builder.setField("pathVal", relativeTempDir);
-            fileRegistry.pathToRef.put(relativeTempDir, new FileReference("bazshash"));
             userConfiguredFiles().register(producer);
             fail("Should have thrown exception");
         } catch (IllegalArgumentException e) {
-            assertEquals("Invalid config in services.xml for 'mynamespace.myname': Directory '" + relativeTempDir + "' is empty",
+            assertEquals("Invalid config in services.xml for 'mynamespace.myname': No such file or directory '" + relativeTempDir + "'",
                          e.getMessage());
         }
     }
 
+    private static class TestDeployLogger implements DeployLogger {
+        public String log = "";
+        @Override
+        public void log(Level level, String message) {
+            log += message;
+        }
+    }
+
 }