Use different exception message if services.xml is missing

2 files changed, 7 insertions, 8 deletions

diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
index f5ad1dce4e7..dd8bb7f78e2 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
@@ -625,7 +625,9 @@ public class FilesApplicationPackage extends AbstractApplicationPackage {
 
     private File validateServicesFile() throws IOException {
         File servicesFile = getServicesFile();
-        if ( ! servicesFile.exists() || IOUtils.readFile(servicesFile).isEmpty())
+        if ( ! servicesFile.exists())
+            throw new IllegalArgumentException(SERVICES + " does not exist in application package");
+        if (IOUtils.readFile(servicesFile).isEmpty())
             throw new IllegalArgumentException(SERVICES + " in application package is empty");
         return servicesFile;
     }
diff --git a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java
index 4742d275918..495a03fa0b2 100644
--- a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java
+++ b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java
@@ -122,17 +122,14 @@ public class FilesApplicationPackageTest {
     }
 
     @Test
-    public void failOnEmptyServicesXml() throws IOException {
+    public void failOnMissingServicesXml() throws IOException {
         File appDir = temporaryFolder.newFolder();
         IOUtils.copyDirectory(new File("src/test/resources/multienvapp"), appDir);
         Files.delete(new File(appDir, "services.xml").toPath());
         FilesApplicationPackage app = FilesApplicationPackage.fromFile(appDir);
-        try {
-            app.preprocess(new Zone(Environment.dev, RegionName.defaultName()), new BaseDeployLogger());
-            fail();
-        } catch (IllegalArgumentException e) {
-            assertTrue(e.getMessage().contains("services.xml in application package is empty"));
-        }
+        var exception = assertThrows(IllegalArgumentException.class,
+                                     () -> app.preprocess(new Zone(Environment.dev, RegionName.defaultName()), new BaseDeployLogger()));
+        assertEquals("services.xml does not exist in application package", exception.getMessage());
     }
 
     @Test