Test file distribution in Application

5 files changed, 17 insertions, 2 deletions

diff --git a/application/src/main/java/com/yahoo/application/container/JDisc.java b/application/src/main/java/com/yahoo/application/container/JDisc.java
index d6cc4534972..0c6caf9fdf9 100644
--- a/application/src/main/java/com/yahoo/application/container/JDisc.java
+++ b/application/src/main/java/com/yahoo/application/container/JDisc.java
@@ -54,7 +54,7 @@ public final class JDisc implements AutoCloseable {
                                                 bindings(path, configModelRepo, networking));
 
             application = (StandaloneContainerApplication) testDriver.application();
-        } catch(Throwable t) {
+        } catch (Throwable t) {
             StackTrace.filterLogAndDieToJDiscInit(t);
             throw t;
         }
diff --git a/application/src/test/app-packages/filedistribution/components/basic-application-contains-my-component-def.jar b/application/src/test/app-packages/filedistribution/components/basic-application-contains-my-component-def.jar
new file mode 100644
index 00000000000..47d66d9fdab
--- /dev/null
+++ b/application/src/test/app-packages/filedistribution/components/basic-application-contains-my-component-def.jar
diff --git a/application/src/test/app-packages/filedistribution/my-files/my-file.txt b/application/src/test/app-packages/filedistribution/my-files/my-file.txt
new file mode 100644
index 00000000000..6769dd60bdf
--- /dev/null
+++ b/application/src/test/app-packages/filedistribution/my-files/my-file.txt
@@ -0,0 +1 @@
+Hello world!
\ No newline at end of file
diff --git a/application/src/test/app-packages/filedistribution/services.xml b/application/src/test/app-packages/filedistribution/services.xml
new file mode 100644
index 00000000000..80c761492d2
--- /dev/null
+++ b/application/src/test/app-packages/filedistribution/services.xml
@@ -0,0 +1,7 @@
+<jdisc version="1.0">
+    <component id="com.yahoo.example.MyComponent" bundle="basic-application">
+        <config name="example.my-component">
+            <myFile>my-files/my-file.txt</myFile>
+        </config>
+    </component>
+</jdisc>
diff --git a/application/src/test/java/com/yahoo/application/ApplicationTest.java b/application/src/test/java/com/yahoo/application/ApplicationTest.java
index 7f14a3e4e16..6f4e6103743 100644
--- a/application/src/test/java/com/yahoo/application/ApplicationTest.java
+++ b/application/src/test/java/com/yahoo/application/ApplicationTest.java
@@ -62,7 +62,7 @@ public class ApplicationTest {
         try (Application application =
                      Application.fromApplicationPackage(new File("src/test/app-packages/withcontent"), Networking.disable)) {
             Result result = application.getJDisc("default").search().process(new ComponentSpecification("default"),
-                    new Query("?query=substring:foobar&tracelevel=3"));
+                                                                             new Query("?query=substring:foobar&tracelevel=3"));
             assertEquals("AND substring:fo substring:oo substring:ob substring:ba substring:ar", result.hits().get("hasQuery").getQuery().getModel().getQueryTree().toString());
         }
     }
@@ -308,6 +308,13 @@ public class ApplicationTest {
             assertEquals(200, docproc.getResponses().get(0).getStatus());
         }
     }
+    
+    @Test
+    public void file_distribution() throws Exception {
+        try (Application application = Application.fromApplicationPackage(new File("src/test/app-packages/filedistribution/"), Networking.disable)) {
+            // Deployment succeeded
+        }
+    }
 
     @Test
     public void server() throws Exception {